arranged the ui components nicer