fix both layout and add bootswatch theme!