Cleaning up layout

Updating for Version 3