Added second view + code refactoring