Fixed Add button and fixed some formatting problems