UI tweaks
cleanup and extracting mixins