Small changes to button format
All features added
Small changes