more refactoring and cleanup...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
added manual image sorting, still not final...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
added mark-based shifting up/down...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
some refactoring and updated todo...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>