Add el support

This adds el support and refactored the layout a bit