Made some layout changes, cleaned some code.