commiting more styling, moving plugins into a layout