Orange buttons + Code clenaup