added edit view and fixed layouts and scale