RPG: Aesthetycal fixes