just refactor
change layout; ugly though