Implemented UI hide + some small cosmetic changes