relocated buttons to top bar, again.