Sorted out mah buttons