Start cleaning up the code and layout.