Corrected some minor bugs in layout and bootstrap-use