minor button and layout changes
merge