Made changes to tiles and UI. Handled some conditions