merging
i hate git
menu button cetnered
fixed merged