Major layout and design changes, some workflow issues fixed