Fix rectangle and add rounded rectangle