merge changes from develop branch - tile grouping and images revamp