Updated with some menu code and fixed search