Added Signup Layout and other minor refactorings