Implement code folding and change layout slightly