fixed navbar - added images back, merged code