Bootstrap layout structure & clean up