Updated color classes to include borders, removed some buttons, updated pi template