[TASK] Layout changes for Bootstrap use