Refactoring: main page + finish with header bar