Moved things from here to there, more ui... stuff meh.

Signed-off-by: Jedabero <jedabero@hotmail.com>