Merge pull request #2 from saulelis/step1

Step1 cell alignment
Merge pull request #3 from saulelis/step1

something minor
Step1 320 and 480 almost done, plus some code cleaning
Merge pull request #4 from saulelis/step1

Step1 320 and 480 almost done, plus some code cleaning
conflictz