Re-indented code, more pruning.

Four spaces of indention with tabs is my preferred style of coding. I also performed some more pruning in the gui.c file. There is much more to be done there, though. The re-indenting of the code will have to take place before we can actually start making changes to the code lest there be merge conflicts everywhere.