Feature/css fixes

2 tier info cleanup. Follow up work is coming