Prettier GUI. More cleaning..