More changes. Added buttons
Re-added the little bubble