Completed UI
Added sample, restructured