Restructure gui