Added a TODO about ugly arrow buttons