some progress, I might try another layout now..