Minor bug fixes and edit some layout focus
Merge branch 'master' of https://github.com/bradshoow/SARA.git