Details finally up on the right content.

Todo : Improve Logic