Code clean up
Custom button theme