Merging Plamen and Amanda's code + updates

- Merged code
- Added error divs to invalid login/form submission
- Fixed some CSS issues
- Tried to fix table populating errors. Still needs work, it was shoved
into the view.