Collapsed property values by default
cleaned up navbar
bootstrap merge fix
minor styling