fixed orange button
merged me and krystals into master