Improve UI, change link layout