Improved layout, added Courier validation, delete method