Working on new styles and borders