UI modification & code refactoring