add cube btn for main screan
fix conflicts