Move around layout file, update button specificity, updated grid mixin.