more changes - menu bar is kinda not working..