Added basic layout bits