Refactoring
Changed detail button
Added strings