Repaired Missing Buttons; cleaned up code.