GUI code cleanup
New GUI recalculations(WIP)
GUI fixes...