Updated template, tested & fixed css issues

Updated template, tested & fixed css issues