GUi changes to fix the sizes