Updated to latest version

Added margins and optimied some stuff