Created better view control & 404 - Closes #34