Added half finished support for several locations in GUI