cleaning up mainview a bit more