Add action buttons
Arrange directories
Refactor with sugarcube