tile updates and bug fixes
merging ui components