UI Refactor / Added SP Detail Screens