Some cosmetic changes and adding add button on status