Added layout, made slighty dynamic