Updated buttons/type, removed libraries