Nawqaan 304

These were almost exclusively costmetic changes. I am be doing another pull request for the rest of NAWQAAN-304