Added new options. added images to rows and cleaned up some code.
Merge branch 'dev1.2' of https://github.com/AdamKyle/Aisis-Framework into dev1.2