Move links into content/ folder. Fix cancel butotn