Imprevments

Labels + button added
Clean code