added Menu, made some other changes to original design