Making things looking a bit better