Fix alignment and other issues