Buttons reorganized to fit into smaller size
Module layout changed