Added patterns
Rearranged buttons