little ui reorganisation!