Reverting broken commits. #40 Revert "Fixed incomplete ass merge. #14"

This reverts commit 3a546d304f80adada8fca84bffcbd58e21e94626.
Reverting broken commits. #40 Revert "Fixing incomplete merge. #14"

This reverts commit 1aed81dfc333c3662794800ede7ce0474f6f1f23.
Reverting broken commits. #40 Revert "Fixed incomplete merge in menu. #14"

This reverts commit b3cb6e11adb86919ab18d3107b35d87af9c80def.
Merging revert of broken commits. #40 Merge branch 'hfx40'
Reverting old changes that broke shit. #40
Merging reverts back into master. #40 Merge branch 'hfx40'