improved layout, added canvas