Added STOMP info
layout fixes
Reorganizing the end