More tweaks to gui and such