Initial solid helpers
Add more helpers
Fix more solid layout stuff