layout changes and right-hand buttons added