Fixed type-o's and layout