Fixing the styles issues

Closes #35
Fixing styles issues between what P changed and the changes I had done
(please Sync next time before changing files).