Fixes for validation & nav border