Modified the buttons to be downwards facing
Merged with master