Fixed compilation issues
New design
Variable renaming.