Updates

Major updates and bug fixes to layout and webapp.