Updated layout and added year field (no functionality yet)