final layout changes and adding buttons