fix issues and update design