Added few changes on frontend