Refactoring UI https://twitter.com/deadcoder0904/status/1058294757951188992