Added basic layout features, still needs work