Polish solution and fix a few typos

This commit fixes a few typos and alignement issue. It also revisits the solution for `Application`.