changed UI somewhat and added basic functionality