Removed placeholder texts
re-ordering + better handling of modifications