Add views and rework key positioning