some styling and a todo