Fixed UI issues and bugs