UI fixed and Error handling implemented