navbar and alert messages revisions and cleanup