Added basic support for shortcuts
cleanup up outline model