Layout changes + add Bootstrap JS