Remove commented code
Implement Bootstrap Modal for frontend