Modified main UI. (0.6.2 - 21)