minor changes being commited for pull
Small master changes, major UI changes will happen on UI branch