Making app consistent...