Added views and main controller