Style and bux fix