Continue refine, fix blue overflow issue etc

Signed-off-by: Ajax Chai <ajaxchai@gmail.com>