Add more info, redesign