bugs fixing and adding settings button on main