Basic styling and tile setup
resolve merge conflict