Alex's changes
Merge pull request #2 from susieye19/master

Format show page
Merge changes
Merge all changes