Fixed GUI Layout, and working on reworking somecombat changes.