Cleaned up axis drawing. Added text and margins