New release
Fixed layout for all functions