Fix drawer and properties