ordering some items

Signed-off-by: Michael Granados <michaelgranados@gmail.com>
Correcting form in some resolutions

Signed-off-by: Michael Granados <michaelgranados@gmail.com>