Implement column fill layout for data views and refactor (sort of)