Boot Straps Layout Fixes