Stylised subject in posts a bit more.
Reverted back to shahid's commits for things which were correct and mistaken by me