Updating app

Added/ Modified a few features as required