Minor button changes, and styling