Improved Button and fixed startup crashes