Feature/3rd floor ui

Here goes nothing...... @elittlejohn