styling issues fixes
removed extra fields functionality (moved to cadolib)