Small adjustments to the UI =)