[WIP][TASK] Fixed some alignment