Fixed stuff
erge
Changes in EditScreen