Fixed sf template inconsistency
removed logout option from header
header links fixed
width fix for nested lis
Fixed merge conflict