Minor bug fixes and edit some layout focus