#181 implementation

changed a bit the layout of the edit activity while at it