Adjusted layouts to work with round and rect