Layout updates, css changes, and bundle cleanup