Lots of changes in gui