Clean and neat UI

by Danny