Restructured views and made login form