Layout Update

Complete redesign. In beta.