Added more styles improvements