Refactored ComponentRequest into own file
Small tweaks, removed redundant state in template
Tweaks to code layout for report use