Finally fixed auto layout
Better shape management