Cc 7 general app improvements

General improvements, commit messages are self-explanatory! :camel: