Bug fixes on UI, Bug created on Backend