menu fixes and Building buff