More GUI parts working