cleaning up ui - making it nicer