Design update #1
Layout and code minor changes #2