Added wrappers for HTML, cleaned up login form