Improved layout (using bootstrap styles)