Frustrating Mobile 2

Fixed last issues :/