UI Layer improvement, and hackfest