pushed design and fix button styling