Totally redeigned the base templates