Refactoring

Renaming broken; LineEdit editing disabled for now