Cleanup and add start of Prop selct