Updated some spec and refactor'd the layout