[BUGFIX] Some changes in order and styling