fixing the damn buttons again. Oh where do the changes go...