add badge improvements and final controls