Actually there are still some issues with the alignment, but I'll fix that for you after merging. You already have done a lot.