Add menu button
Fixed some annoying stuff