Cleaned up UI a bit

Also increased number of messages from 10 to 30.