[WIP] PSM Step 1

This is totally WIP.
Can't you move this div class right-outlet into a template?