switched to miglayout
fixing conflict