finished rejigging optimization screen, some problems though