fix layout tweaked with better comments