fixes and better demo layout