Fixed worst GUI problems