Minor changes - html style tuning and refactor