Feature improvements

This adds various UI improvements as well as some code cleaning