Major refactoring of code completed!  This will make future UI expansion much easier.  Also, fixed the redraw logic when switching platforms.  Many bugs still remain but this is on-par (both features and bugs-wise) with the last revision checked in.