component alignment and property clean-up, templates
fixed tutorial