Added points and layout improvements