Added a Top bar and covered many issues in this pull request