after comp o tishion

includes button changing