Merge pull request #53 from saulelis/hp

Hp
sidebar half way
Merge pull request #54 from saulelis/sidebar

sidebar half way
Groupable some changes
Merge pull request #55 from saulelis/groupables

Groupable some changes
conflicts