Issue: #110 - General UI enhancments
Issue: #110 - Further UI enhancments
Issue: #110 - Clean code
Issue: #110 - More cleaning