Style improvements, fixed for android too