Adding more info, redesigning slightly