id compoenent refactoring, and static admin/portfolio form
merge from web master