Fixed ground floors and made current floor highlight
Merge branch 'wills_branch'