Made some minor changes
Done with the initial application