Fixed button caps, added option framework and icon