lots of fixes - started working on Plan Type tab