Restructuring and initial tap view