Button fixes/Source style update