fixed some issues and changed the layout a bit