Cleaned up specs. Worked on the layout. Refactored code.