Move rectangle stuff into css