lot of gui changes and moved some files in git