merged layout login page
Merged layout from @Sycliewhite