Integrated components, added login and register