Added new box style and more fixes