Improved UI

Resolves #120 
Resolves #166
Resolves #165
Resolves #178