Added main page
UI update
PuzzleActivity.java merge