Fixed #470 Fixed #503 Fixed #504 Fixed #505 and worked on image catergory and link for #494