Cleaned up code a little
Added "Add" button