Refactored default bindings in application