More GUI work, added some labels