Various styleing improvements