Remove redundant viewport (defined in styles)
Adjust organization, fix display bug, create test