Changed some thing regarding Buttons/Color