Fixed CarpalX layouts, cleaned up