Fixed Errors and updated UI

Signed-off-by: vaibhav121 <bhasinvaibhav97@gmail.com>