Fix two incorrect key names

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>
Add terminal workspace and tweak layout code a bit

Signed-off-by: Ray Lehtiniemi <rayl@mail.com>