Inner re-design of some components<br />Bug fixes