Updated abcs layout 

Keyboard layout - needs a video view on top of it
Merge branch 'master' into status-bar-2