building & room search fields added, layout updated