Add arrow controls and nicer layout