Use bootstrap. Improve layout now uses full width
Fix spacing errors. Only show caption if it exists.