Added a bunch of functionality, and layout improvements.