cleanup and fixing buttons