Minor UI tweaking, preparing for new features