Code cleanup
#317 Bug with ResourceGroup position