Changed button position

* Also relabled buttons