Resolved the few bug added the more navigational menu's etc

Signed-off-by: Roshan <roshanbhgt@gmail.com>