Gui changes, support for adding new facilites and deleted unused stuff