Improved UI

You'll probably need to check this one out.