Rewrite UI. Support more short keys