Invoice generation preparing
Style fixes