Standard Button Class + Other minor changes