More UI work and playing with Swift