Minor UI Polish & TODO added