UI Design.. still incomplete