Refactored the UI to make it cleaner with incluenced from iOS 8 :)