Add a close button
Code formatting and refactoring
Merge pull request #12 from NextFaze/feature/close_button

Add a close button
Fix merge conflict