Navigation layout enhanced
Files cleanup