Design changes and add two buttons