Added basic view based layout