Switch to 'inline-block' for buttons -  Should fix #1