Even More GUI Update

Mainly updates to help performance