new edits, added canvas border