Edit problem and some improvement of feel and look