Better box styles, fix bug