Updated button parameters, general cleanup