Fixed layout
Added connection pooling