Revert "Revert "added changes in jailing and luxury tax + 3 more buttons""

This reverts commit 3f1dc14c79407becca10c79c7251f43e753ea5db.